fix metadata related test failures, see #53

reverts 727df56 and d203a56