Fix for review comments: Fixed parsing for nested messages, made test methods non-static; @Overrides were added by save action