Added tests. Organized in packages.