Some updated testing.