Refactored the core test class into a separate module to further untie things.