Add some tests for Optional