updates to a few tests ... and some are broken