Clean up some tests..
Conintuing to clean up..