Slightly improved web interface tests.  Turns on waffle switches where needed.