cleaning up some tests