Small updates to tests

* cleaned up test directory
* added few more tests