Added more tests, and binary options