Bring testing and master into sync