Change the manner to work with forms + tests