- Cleaned up code.
- Changed integration test to handle
  different order and the new line at
  different time.
- Groovinized.