Added some tests and fixed line/circle issues.