CLOUDIFY-2134
Added more parser tests + tests refactoring