Added more rigorous testing.