working on test suite...