Added more tests. Moved tests. Changed fields.

Added additional info to show model. Changed cost to a char field.