Finished extra functionality test cases, just missing photo testing
Merge branch 'testing'