Added crossroad test; Bug fixes; Deleted some tests