Unit Test updates

fixed bugs