Merged with test