Update build script
Fix tests updates