Add basic integration test to the build, and some other minor stuff