Organize imports
Fix assertEquals() parameter order (first expected, then actual)