added a line test (2N1E) and a circle test (1N1E)
Merge branch 'newTests'