Use new form in home_page, simplify tests.  NB breaks stuff