Removed useless classes.
Updated tests.
Added support for relative uris.
Merge branch 'tesuttelu' into development