Add more tests to suite