Add toMaybe to Optional

Also add Maybe Optional tests (which should have already been there)