MDL-46891 behat: Re-arranged classes