Fixed problem with unit tests. Adjusted so that they account for the code changes.