Simple form test and fixes