Some work on testing.