TESTS: Improve coverage and timing of tests