Fix range and has-not tests
Merge branch 'tp3' of github.com:vsu/ogre into tp3