Polish various test classes