Moving test into test package
Updating package
Formatting cleanup