Fix broken tests

Fixes the remainder of the tests, excluding the ones broken due to oauth.