Updates to DatabaseRegistrationStore to allow for class lookup, tests to match
Merge remote-tracking branch 'origin/master'