shuffling things around so as to move the test stuff down into test, next package cleanup
more shuffling of test configuration and dependencies