Updates to make tests pass
Many, many updates ...