Updated links to current version
Minor fixes to tests