FormBuilder split out
Fixed auth tests