got all tests to pass including last two