Fixed broken unit tests.