Fixes test compile failure due to Java7ism
Fixing javadoc warnings.
Copyright notices