Move methods that are used only in unit test to ShelfExt.