Merge "Use org.junit instead of junit.framework"