Fixing broken unit tests and adding new unit tests to cover new functionality.