Test and signup form refactor