Updating for broken tests. and then breaking some more...