Fix two develop tests broken by crossed merges

Tests written before a validation merged failed on develop; now follow the correct flow that the validation allows.