Trying to push the refactored tests #25