Updated testing suite.