Fixed union, also fixed test case