Migrated to Java 8 + Minor testing