Fix failing tests. #209