more rake test changes