Added a drawingtool test
Updated the simulator service test
updated the application state test
Added a simulation result test
added a simulation test
Solved merge conflict and added testcases to test suites
Solved merge conflict in dev.xml
Solved merge conflict in Client unit test suite