a few minor test fixes/cleanup