remove unused integration test code and fix a small template bug.