Replace old hashes with new 1.9 ruby hashes
remove trailing spaces
Repair failed test