Some 508 fixes and updated tests to work with 'No. of Contracts' column