Typo
Java 6 compat
Ignore unfinished test.
Java 6 compat
Prepare before moving to gradle