Added the content class with tests
Removed mockery, don't think I'll need it for testing