Shortened a few more lines in test files