Make autotests working properly - small changes on the code
Merge branch 'master' of https://github.com/mtxr/g4-trab4