Fixes #1088
Fix failing tests.