Match renamed to Return. Added tests