Adjust test-cases for slightly slimmer exp structure