Finished ActionParser refactor and tests