Add some tests. Fix an issue with the form submition