Update to test suite