[FEDIZ-86] - Adding metadata support for spring + tests