Fix trailing whitespace
Adds sort to fix flaky test
Skip failing report test