More clean up around unit tests. Commented out SO tests as no longer used.
Merge branch 'newdev' of github.com:k-int/KBPlus into newdev