Added unit tests, added namespace