Add a few more None tests and fix a couple more missing priorities