Adding more tests to test suite