Feature/upgrade test and deployment suite