Do not commit Gemfile.lock
Refactored test cases

fixed a bug when polishing code with bin/rill