tests&refactoring - further decoupling. Storage controller and AddEDitItem controllers are covered by tests