Two new test classes and some changes to methods and existing classes plus bug fixes
Merge branch 'master' of https://github.com/AVATARW/Mirror-Edge-Main