Merge pull request #184 from theresaanna/master

Content View: definitions refactor, unit tests