Import Von's tests, with cleanups.