Added tests to Drawing app

-Added XShape
-Collision objects now inherit from Drawable