Fixed all runner scenarios