Merge the different bundle in one and add some tests