Improve and clean up integration tests, benchmark.