clean up some tests (less stackTrace)