Changed tests folder and package.