Windows does not like multiline commands
More testing cleanup