cleaned up some tests