Update BundleItem model and spec for better test coverage
Remove unused spec code + clean up style