Also, by removing the `!= None` part 15 tests fail.