Can you remove the old /form and /contactForm stuff? (in routes.java, ApplicationController and the views?).

The reason is that it does not make sense having /contact and /contactForm when there are no tests. Your /form covers all cases.