Issue #2373233 by idebr: Fixed notices in tests (PHP 5.4+).
Moved "Add choice" button up.