fixing/updated existing tests for this change