Removed old test stuff
Added StorableServiceBuilder. Because singleton may be freed anytime