test
remove test
fix nil error
fix the way we deal with persisted scopes