[] patch up so tests pass