Improve tests again and remove unuse