Sonar 3.0 and Branch Coverage Support

Hi, 

Please check these changes. I'm not sure why the test is failing.

Can you please check it?

I would also like to add some more tests for my new classes...