Merge pull request #1606 from YosysHQ/eddie/improve_tests