Added test class and shape...

Little work on the code