Set to the correct UI and added closure testing.

Signed-off-by: Benjamin <benchisa@gmail.com>