WIP: old tests pass

Change-Id: Ib79c8d846698614b0cf79e420986562d1eae6855