Merge branch 'develop'
Take advantage of automatic assembly binding redirecs in the test projects.