Trying to update tests a bit more.