WIP: troubleshoot failing tests