added some tests for Option support