Improving coverage

Just snuck above 90% with the tests files excluded, and I need a break from this after an infuriating morning with selenium, so time to merge.