Added fields for test case points and let the bridge do the math