Fix layout
Move nullopt to Object column
Fix test for global swap()and make it analogous to member swap test