This actually gets those tests passing, whoops