Clean version with tests.