Moved things round a little bit in testing land, though tests still don't run on the android machines...