This is in preparation of moving all tests into a separate package to enable ease of coverage checking and testing.
