implemented new test system