fix tests for rails master