Updating to include new permissions table
Fixing up unit tests
Fixing up unit tests