Test system improvements