Fix enforce_extra with joins + start advanced tests