Remove daimond.
Add JUnit