Add item, magic items, and subrules
Refactored test