Made docstrings uniform
Add tests for EntryPoint; refactoring