minor changes on forms and test data