~ improve tests