Overhauled testing suite.