fix build (accesstype/approvalprompt moved upstream)
fixing tests
Merge pull request #1 from jtolds/master

fix build (accesstype/approvalprompt moved upstream)