Dont remove favorites and unit tests