Selfcleaned tests. Some problems with changable uris fixed.

Please enter the commit message for your changes. Lines starting