Add some tests
Add Bundler, Tide up, Apply some comments from rubocup