Fixed tests after resolving git conflict issues