Modified testing strategy. Updated rspec files. #570