Fixed all tests. Added namespacing support.