more approvaltest fixes