Update testing to follow master