Reorganized tests and added a few more.
Improved test coverage