Fixed some fail tests needed to run rspec command correctly.

Still there are some test cases failing.