Updated to fix a few small issues and improve form handling
Added extra test functions
Added test pre-header