Now passing all of the tests.