Add more tests for Optional wrapping