Removing Where when it is possible; add XUnit.extensions package