Added new tests and test suite