Now passing all tests.