rejig for tests

as above