Pull from George. Fix unit tests.