Fixed Unit test issues created with last commit...