TESTS: Improve coverage + timing of tests