Replace String() with Format(), and tests