Added bundle model and updated tests