Fixed test cases, added support for filled and outlined circle to shapes