CLC-3588 - Updated tests to accomodate modifications to methods