Issue 1331 -  Rationalise buttons on home page, refactor tests