updated sql and tests to match new scope strings