Add some javadoc, do not use deprecated junit api