Just a little code cleaning
Added test scaffolding. Some code cleaning.