Update and test against 7.0-alpha7