created tests for listing model
fixed merge conflicts
Merge pull request #46 from sgray11/rpec_testing

created tests for listing model