Fixing couple UnitTest that broke in TeamCity
Small fix to char prob also fixed in https://github.com/TeamMentor/Dev/pull/23 (but that Pull Request cannot be merged since the .dlls have changed)
Merge branch 'master' into Fixing_Unit_Tests
Merge pull request #33 from TeamMentor/Fixing_Unit_Tests

Fixing unit tests