Add last changes from WC test plugin