FIX ALL OF THE TESTS!!! (>'-')>  <('-'<)