refactor based on Roland review
fixed tests based on changes done based on Roland review