Kepler changes and new tests.