Re-jiggling test class