Expanded the test suite with a lot of tests.