Major repair work and merged in wordpress-tests