One more try to fix building on buildhive, also add slightly more coverage and remove useless null-check