Mock system improvements, tests.