Minor modifications to the form, removed empty test class.