Add tests. Improve code coverage to 37%.