Remove unnessesary string result, fix some tests