Added a new testing infrastructure