Refactor message parser spec
Tweak github commit spec
Refactor base spec