try to improve tests