Fixed failing tests
Merge branch 'FailingUnitTests' into master-veda