Close #1079
Cleanups
Fix failing tests for good.