Adding some tests
Merge branch 'master' of github.com:4Soft/SAFIRA