Unit tests + rake task added