All bug fixed raised by testing team