Update tests after merging in master