Updated locator to look at specific makes and corrected assertion logic