Added changes for RSPEC functional tests