Removed unnecessary methods, made buildAbsoluteURI() a more general method that returns URI, added more unit tests to improve coverage.