Added more tests and suites.