Stratify tests

[jo-mueller]

There are currently probably a lot of tests with overlapping functionality which drags out their execution times. We should identify overlapping test cases and merge them these into fewer test functions.