Unit Test updates

fixing bugs