Fixing integration tests
Merge branch 'development' into SanchoSLMWork
Working on integration tests
Merge branch 'development' into SanchoSLMWork
Merge branch 'SanchoSLMWork' into development