minor cleanup part of review #123
Fix of failing integration tests