Improve unit testing

[MarkMelotto]

Making the tests all test one function instead of several

[BSchilperoort]

I don't think it's really needed to improve the unit tests. It's all testing outside of the true CDS API calls anyway, as we cannot test those on CI.