Fixed some problems with content suite test case