Updates for new version, references to tests