Metadata class added, tests complete, all tests running