Finally have all tests passing.