Expand test suite