[stories/US00001] minor tweaks
[stories/US00001] update tests