Fixed up unit test issues
3 files changed