Test with parsing improved