Minor Refactoring
Completed domain tests