[minor] take into account feedback, rename vars, add additional unit test