Changed variant representation. Added binary version tag.
Fixed some test issues.
Fixed build error.