Fixing no namespace bug, improving TestCases