Comment tests, add dynamic destination, add more tests