Adjusted docs and some refactoring. New Testers