Fixing the testing framework slightly.