repair apiary and test problems

[lionfacegrrr]

i noticed while going over Alex's notes on our last project that generation and media_format are mixed up for our api we must fix this and the tests