clean up and small fixes in test classes