progress on test suite