Fixed some tests, added more validation

Martin Weiserequested to merge
406-unstable-tests-in-metadata-service-cause-pipeline-to-fail-randomly into dev

Closes #406

Merge request reports