QA merge, Ebs and misc test cleanup