Tweaked how test are organized in the package