modify based on preview pull request comments

modify based on previous pull request comments
fix some rspec cases