Refactored form tests