Improve basic integration test