Jacket commit, fix tests.