Remove newlines and tabs
Adopt test according to previous change