Added match for variant.
Added more test for variant match. Remove using namespapce std.