test tweak
minor cleanups