ResourceGroupParser refactor

Stuck with the commented out tests failing.
These checks should be in the refactored code as well...