Simplify and cleanup tests