Formfill tests pass now