Test files tweaked for readability