Update unit tests
Merge