Improve integration test tooling, write more tests for help