General revision and test.