More strict var unit test fixes