Fixed some broken tests. Whoops