Fixes logging output
Comprehensive tests on 4 more instruments
Merge pull request #1230 from lukecampbell/ooi

More OOI Preload Comprehensive Tests