Modified Source And Tests Minor Refactoring