#67 updates to fix up failing tests after change