More making tests pass