refactoring/cleanup - test fixes - add metadata adj for later editable metadata feature