Changing package declaration to match test file location and removing un...

...used imports and unnecessary semicolons.