Cleaned up test packages.
Remove non-javadoc comments
Added and unified Apache License headers in all files.