Updated tests ready for better staged_changes method