refactor test form