Final attempt - tests should finally pass.