start of preserving expected values in test cases