integration test and minor behavior modifications