Adapted tests for PS v2