Fixed shell and added integration test to prevent failures in future