minor test fixes and cleanup