Fixed implementation issues. #570
Removed unused rspec helper file. #570