Added more tests to OptionalTest