kostas - tidying up tests.