some cleanup + added MetaData tests