- Fixed tests that were too tightly matching output to look for key content only