Minor enhancement & test