Organized imports and changed to org.junit.Assert instead of junit.framework.Assert