Removed some Sonar warnings
o Removed useless imports
o Fixed references to junit.framework.Assert