Improved test coverage to 35% of lines.