changing tests for new spec

changed my mind, not using one model for all types of items
tests now reflect these changes