Refactored some stuff, added the tests of the final block.. Also some exceptions
Merge branch 'master' of https://github.com/AtsK/KAT_prj