Added related URIs
Refactoring + JavaDoc
Updated method signature (protected for tests; no need to throws exception
Added test import file