Update Smoke scope of test, update build xml, change ant targets