refs #6449 This should fix it

The clear consequence of choosing bad name for the thing and forgetting about it.
refs #6852 Small changes to unit tests
Merge branch 'feature/6852_WMatrixAvailibleOnWorkspace' into develop
Merge branch 'develop' of https://github.com/mantidproject/mantid into develop