Joined some tests in the same methods