Fix Misc Tests