Final changes to get orm_adapter specs running