Change some tests to the expect syntax to make them pass on Travis.