(#17) Fix failing tests.