Broken tests are bad.. Let's fix them