Also slightly refactor the existing crlf test to better fit in Change-Id: Ib4dfa4b3318b3dd55a12d99a9f4908cdf1bce08b