first changes on integration tests
next changes on formHandling