Fix failing tests
Dist housekeeping