Let's not forget Rails 2.x / fix tests