Improving unit tests and fixing styling issues.