Updated import to use org.junit instead of junit.framework in a few test classes.