Integration test fixes - metadata