Fix various tests (dfba, collection)