Be consistent when naming test classes
Remove code duplication