Fixed bug in option_type
Reenabled many neighborhood tests
Merge pull request #212 from izaid/neighborhood_2

Neighborhood fixes