ResourceGroupParser refactor

Stuck with the commented out tests failing.
What do you want me to do here?