Refactored tests for thymeleaf/thymeleaf-spring#46. Enabled for 2.0 too