Merge pull request #363 from pshivana/master

Migrated few controller view specs to new rails