Refactoring unit tests to have a consistent structure for both tests and code files. Adding additional unit and integration tests for code blocks that haven't been covered.