Fixed few test codes