Major changes to test system