Added more testing.