Fixed all references and unit tests. All unit tests passed.