cleaned up code to pass unit and integration tests after consolidation of base McLane driver