Fixed all content related bugs and added tests-suite