some more work on tests