Fixes up tests