Modded some tests and added some hacks to make other tests pass against the new code.