Refactor namespace for TestLibrary