Organized imports.
Added inlining tests.