Minor fix and run test added