Revised unit tests
Closed #9