(#16) Fix failing tests.