Restored failing test
Restored dumbster test
Mixed Refactorings

OurDate -> XDate
Moved main to its own file
Updated pom for dumbster.