Fixing the test loading and fixing the namespace of some files