fix short circuit tests