Remove obsolete return.
Add tests.