Refactor resource collection tests