ValueDehydrator, broken tests fix