ROOMS-322: Bugs fixed and improvements while creating behat tests