Clean up tests, add apply str