Adding additional changes & tests

Adding additional changes & tests