Sorted out the package references for main and tests.