Form tests tidy up