Renaming and simplified tests for P01/02