cleanup
Move Constants to Constants
Remove unnecessary comments
add some tests
change assertions to Hamcrest ones
Merge branch 'refactoring' into implement-bonappetit-button