Rejiggered things a bit for tests packaging to be happy.