Added more generictoken-based tests
Added tests for thymeleaf/thymeleaf#224, improved th:remove