Fixing unit tests

And typo referenced in https://github.com/TeamMentor/Dev/pull/23