Merge pull request #99 from MartyBurns/master

updated sql and tests to match new scope strings