Proxy getters marked as deprecated
Tests names refactoring
Removed dead code - uri property always is set there