Expanded the test suite to 38 tests