Fix tests

Correct two unrelated problems that prevent successful test execution.