Fixed most of the tests that broke from merge changes