Add shuffle string test + cleanup