Added tests
Merge branch 'master' of https://github.com/Auronspan/SURVIVE.git