Run prelim integration tests, note initial fixes