Tests passing now, but recently ended and starting soon need more attention