Simplified second test case and implemented return statement visit