Remove cell extension.
Clean up and fix tests.