Add tests for untested functionality and trimmed out unused code