final changes and preperations for staging tests