- Refactored to with closure
- Disabled findBugs for Test (temp)
- Refactored using with closure
- Disabled findbugs for test temporarily