MERCURY-SPRING-0003: Minor fixes in tests.