Added duplicate tests for edit room as well, re-merged the two room forms