More work towards making tests pass