Better tests
Java8
Remove duplication