Pr Changes, Unit Test Updates and fixes