fix integration test, fix inconsistent spacing, comments