#4 Reformat and test for Base and player