Fixed some unit tests after merging