Updating some tests