TEST: updated and cleanup the tests. Allowed testing with different crossing angles