* return the new values if modifications dont yet exist
Signed-off-by: David Pait <DP19@users.noreply.github.com>

* fix tests
Signed-off-by: David Pait <DP19@users.noreply.github.com>

* removed outter if statement as its not needed now
Signed-off-by: David Pait <DP19@users.noreply.github.com>
(cherry picked from commit 6aefbdcf)
(cherry picked from commit efad4071)