bring testing inline with master