Updated the assign unit tests to show it can handle variants (+ refactored a bit)