Merge pull request #37 from ramith/master

Changes to make integration tests work for MB
Enchacements to UI Tests and some fixes to make things work