Don't Worry, be happy, ooooh no no no no. Fixing Tests