added content model and tests