Improved testing.