Update unit tests
Update unit tests