upgrade to latest snapshot, fix standard tests