Fixed Sonar violation
Added some tests for view area