Minor
Rewrote testing framework for checking forms
Merged with rob