Bug fixes and test fixes
Merge remote-tracking branch 'origin/feature/ADAMBackend' into feature/ADAMBackend