Merge unit tests