Added return expr and fixed tests