few test fixed