Improvements on TestForm