Merge "Fixed unit tests"