Converted new test to be speedier.