Small update on FormTest