Added spock framework for some tests
Added spock framework for some tests
Using spock instead of junit for MediaTypesTest.
Merge branch 'master' into spock