Minor code cleanup

- Use new expect syntax for rspec
- Use require instead of require_relative when possible