Added shapes canvas test.
added tests
merge
added usercontrol test