fix broken test, remove useless null check