Last tweaks on test site