@danielpassos I've just updated the code with your suggestions

@secondsun how could I test the "Context" class or mock? Or should we trust only on integration tests? I don't bother on add an interface, just not sure how to make it easy for testing