Make those tests pass yay