All tests pass, but site/collection still need more refactoring