Drop commented code.
Add some tests.