Re-added Integer and String tests.