update test and then merge with master