gras: tweaks to unit tests