Updates towards testassist