NAK-830 some suggested changes based on code review: removing some of the alterations to the test and metadata handling