renamed test classes to be less redundant