updated per bills comments and tidied up test