Noticed had missing imports in tests, this adds them and orders imports consistently. Not sure why eslint missed this.