Minor test fixes (Staff report tests still reporting error despite working manually, though).