Made checkMapping local, commented out it's unit tests.
Merge branch 'master' of github.com:sangisos/pkdhomeass1