Replaced obsolete junit.framework... imports with org.junit... imports.
Also added a @SafeVarArgs where appropriate.