More test level improvements courtesy of thp