Added support for rake test