Tidied up the form and some of the tests. Removed a couple of obsolete items