Bring in changes from testing