Added Geltner Return calculation and fixed return tests