Fixed a bunch of tests, were down to seven failing.