Refactor photo tests