working model and controller tests
fixed .text of caption
Merge pull request #8 from gopher-snakes-2013/model_tests

working model and controller tests