added a few more tests and organized test suite