Code cleanups

Fixes an issue on the "Videos" test case, which was not correctly named. 

Also adds a generic function related to resource retrieving, making the code more consistent.