Add testing
Merge branch 'testing' into master