Working on it for automatic merge

Working on tests