Organize imports
Commented Batoo tests out