more improvements to test system