ResourceGroupParser refactor

Stuck with the commented out tests failing.