We've got our guns and horses

Should fix all form test results; will fix some of the table test
results