minor changes
minor changes
Added integration tests (the minimum set). Plus minor changes.
Merge remote-tracking branch 'origin/develop' into develop