Fixed package so that the tests are an annex to the main thing, and not the opposite.