check for None
fix test