Updated test system; 35 brand new tests