Working into the test suite