Better test suite