Updated merged changes from open source core and master; Added test cases for Open Id connect classes