Issue #61 : touch up style in test and simplify new logic