updated to match updated security schema
added tests