Feature/bundle fixture

Should be reverted.