removed deprecated lines
added tests for each view/method
Merge branch 'testing'