MISC: address comments and test failure