reorganize test dir a bit