Unit Test updates