also fixed behat tests and comments behatnotneeded Change-Id: Ic56c1ccf652f00312c40e4093ec73666096ed80a