More tests passing.  Solution is working.  Need to test edge cases.