#CRA-700 Some bug fixes for crashes in test cases 1 and 3
Merge branch 'CRA-505' of https://github.com/CRAVA/crava into CRA-505
Merge pull request #116 from enesvold/CRA-505

Cra 700