Intitial revision.
Test cases.