Update tests, hope this doesn't kill the buildbot

This moves more tests into the passing area, and adds a few missing tests.

-[Unknown]