Reduce usage of SOS API classes
Merge branch 'master' of https://github.com/52North/SOS-Test-Suite.git