fix and add tests for empty return statement