Move tests around.

Try to fix timing issues in formhelper tests.