further work on tests