upgrade test & bugfixes