Fixed broken unit tests...
Use the context identity in the query, too