Update Build and tests