Fix Suite Tests