Expanded the test suite further