Some more work on test system.