Fixed some tests and ordered imports alphabetically