- Minor Refactorings and more tests