ResourceGroupParser refactor

Stuck with the commented out tests failing.
>  To do this, I need #139 to be merged into this branch. 

Why is that?