more fixes to nvram test