Rspec testing tweaks to comply with the new DB schema
Refactored models to mixin inventory_utils.rb methods for validation