Refactor any tests