rails32 | Subhas | Fix some regressions in tests