Updated Testing Framework fixing Travis Builds
Merge branch 'build-fix'