Enchacements to UI Tests and some fixes to make things work