Tests pass but client ID stuff is weird