Adding return, block and if evaluation, adding some tests for those functionallities as well