Rename test configs
remove empty test
Remove unused field
Use Guava Objects instead of Java 7 Objects