Fix failing tests #12