fix build (accesstype/approvalprompt moved upstream)
fixing tests