Fixed all issues with tests not related to named state parsing, those are still to fix.