Refactor tests to split ObjectMeta from TypeMeta