Proper behaviour enforced with unsplittable vars; Updated test cases