cleaned up code of some tests