Added more unit tests
Code clean up