Create almost all metadata tests, need to fix some other classes to finish it
Merged with orign/master
Fixes for the merge
Another merge