Finish up basic integration tests