XD-1139 Polishing

- Use Hadoop rule in tests
- Add module options