FIX ALL THE UNIT TESTS :cocktail: