minor tweaks, added test to increase coverage