Sorted out test suite