adding a class conditional test
using strings as scopes is not used anywhere, so remove it