Fix tests

Move over entirely to fixtures to fix the broken tests.