Finishing the refactoring of testesm removing the repeated testing