added more tests and namespace