Added more unitTests
Removed "export all" calls NAMESPACE