organized imports and added @SuppressWarnings("unused") in Tests to
remove warnings