Tests updated for more validation and link paths