Add unit tests for new claims overloads