Small refactoring to integration tests, now using TestRestTemplate