fixed force option and broken test