remove some todos
fixed some tests
Merge branch 'add_authorization'