refactored rspec and params.pp