Fix unit tests
Remove static from method

Based on code review discussion, it's better to utility
methods non-static in service classes for ease of overriding
in unit tests.