refactored form fields, simpledata and simpledata tests by hand

some pretty confused and confusing merges by git, but now untangled