Fixes up a bunch of failing tests with hard coded ids. Still need to fix a few more