Merge pull request #317 from gavincornwell/1.4-dev

Various testing fixes and improvements