Improved rake tasks - tests