fixes to data tests and analysis test files