Use mockito for core testing
Use hamcrest matchers for expressive tests
Slightly better testable interface
Experimenting with various hamcrest matchers