Tests fixed to work with fresh Rails