Added possibility to multi line return.
Fixed bug in CreateMakeTest