Move strings to functions
Less brittle tests