Making style fixes and removing usage of junit.* classes.

Signed-off-by: David Marques <dpsmarques@gmail.com>