Adding support for return in grammar
Adding return hbl test