Refactor tests according to guidelines on Better Specs site