Fixed a bunch more tests. Includes weird workarounds.