more rake tests
merged latest pull