Remove redundant factory model expectations
Misc spec fixes
Only activate an item if it is available or all sub items are activated
Return status for commit!, activate!, delete!
WIP