some better handling of tests