Fix some test failures. Ugh. Huge pain.