Further updates to UnitTests