Fixing of minor bugs found while implementing test cases