Updated functional and UI tests