Added better test suite