minor tweaks for test and lint updates