refactores namespaces in tests, cleans up fixtures