Updating UnitTests to latest batch of Lucy's Jade changes