Removing verbose; adding unit tests
Removing verbose; adding unit tests