Added some more test + fixes
Merge branch 'master' of https://github.com/Hexanome4202/test_devoo