Test Fixes for master

Brian Chiu is out so i'm sending these test fixes for him