little refacotring around tests and removed some comments in code. Experimenting with options for rakefile.