Added reference package
Use static imports for Assert.assertEquals
Fix merge conflict