name tests correctly
use model for content and cache it
Merge pull request #68 from ryn0/master

performance/ test naming