Enchacements to UI Tests and some fixes to make things work
Merge pull request #38 from ramith/master

Enchacements to UI Tests and some fixes to make things work