bug fix on merge and more thorough test