Adding bulletproof tests
Merge branch 'master' of https://github.com/enwida/idpRepo
Fixing testing issues