Add tests for viewing listing
Resolve merge conflict