Implement new test system