Refactor export-controller spec a little