Refactored tests and made sure they pass