Further steps towards matching the test cases.