Fix JUnit XML generation with test failures.
Fix both store tests to pass at the same time.