changed marker
add return instruction and fix the tests