Removed out of date integration tests - should be replaced by Bert's UI testing framework
Merge remote-tracking branch 'origin/newframework' into clips
Fixes per code review