Fixes for return code passing
Added return to server model
Merge branch 'feature/fix-cucumber' into develop