More work on making tests pass.