Raul

I've made some more refactorings and improvements, while following java and maven best practices. Most of them are on the Test classes.