* Remove duplication found in tests and unify namespaces of common code * Stub out dontlink-mac since introspection took over