Fixing tests to new plan names