Merge "Fixed unit tests" into main