Merge "Removal of older test profiles"