Fixed rail test.
Merge branch 'fix_tests'