fix some tests with None
fix comments