Fixes.
Updated metadata name test.