Added some TestMethod/Class annotation

Change-Id: Ib33669776b246f5853068326653bf75d2b271fb6
Some test code clean up:

- do not capture exceptions if that indicates a unit test fail, but declare a throws
- use org.junit instead of junit.framework
- assertNotSame(0, svg.length()) instead of assertTrue(svg.length()>0)
- removed the model field which was not used

Change-Id: I6a3844113b7305300f6d3e790e2aba7d6e0b32a5