Fix whitespace characters, and test timeout.