changes UI & tests