#87: changes to make tests passing