Added test for listing with content.
Merge branch 'test' into dev